Skip to content

Cleanup and grooming of CI (backport #1701) #1702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 25, 2025
Merged

Cleanup and grooming of CI (backport #1701) #1702

merged 1 commit into from
May 25, 2025

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 25, 2025

@mergify mergify bot added the conflicts label May 25, 2025
@mergify
Copy link
Contributor Author

mergify bot commented May 25, 2025

Cherry-pick of 29298ca has failed:

On branch mergify/bp/humble/pr-1701
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 29298ca.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/jazzy-binary-build.yml
	modified:   .github/workflows/jazzy-debian-build.yml
	modified:   .github/workflows/jazzy-rhel-semi-binary-build.yml
	modified:   .github/workflows/jazzy-semi-binary-build.yml
	modified:   .github/workflows/jazzy-source-build.yml
	modified:   .github/workflows/rolling-binary-build.yml
	modified:   .github/workflows/rolling-rhel-semi-binary-build.yml
	modified:   .github/workflows/rolling-semi-binary-build.yml
	modified:   .github/workflows/rolling-source-build.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/humble-binary-build.yml
	both modified:   .github/workflows/humble-debian-build.yml
	both modified:   .github/workflows/humble-rhel-semi-binary-build.yml
	both modified:   .github/workflows/humble-semi-binary-build.yml
	both modified:   .github/workflows/humble-source-build.yml
	deleted by them: .github/workflows/prerelease-check.yml
	both modified:   .github/workflows/rolling-debian-build.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@christophfroehlich christophfroehlich force-pushed the mergify/bp/humble/pr-1701 branch from 8838192 to 2b3b532 Compare May 25, 2025 15:57
@christophfroehlich christophfroehlich merged commit 236c895 into humble May 25, 2025
7 of 8 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1701 branch May 25, 2025 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@christophfroehlich